only remove the signal if the box exists.

Thu May 27 00:07:47 2004  Jonathan Blandford  <jrb@gnome.org>

        * gtk/gtkcombobox.c (gtk_combo_box_list_destroy): only remove the
        signal if the box exists.

diff --git a/ChangeLog b/ChangeLog
index c5d872d3b1fc1ae170ca5e1084a41a6b6972e774..7cfa2c14054533e1325bc953e60bf3eb478a9825 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May 27 00:07:47 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_list_destroy): only remove the
+       signal if the box exists.
+
 Wed May 26 23:26:51 2004  Matthias Clasen  <maclas@gmx.de>
 
        Support insensitive cells in tree views and combo boxes:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c5d872d3b1fc1ae170ca5e1084a41a6b6972e774..7cfa2c14054533e1325bc953e60bf3eb478a9825 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu May 27 00:07:47 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_list_destroy): only remove the
+       signal if the box exists.
+
 Wed May 26 23:26:51 2004  Matthias Clasen  <maclas@gmx.de>
 
        Support insensitive cells in tree views and combo boxes:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c5d872d3b1fc1ae170ca5e1084a41a6b6972e774..7cfa2c14054533e1325bc953e60bf3eb478a9825 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu May 27 00:07:47 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_list_destroy): only remove the
+       signal if the box exists.
+
 Wed May 26 23:26:51 2004  Matthias Clasen  <maclas@gmx.de>
 
        Support insensitive cells in tree views and combo boxes:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c5d872d3b1fc1ae170ca5e1084a41a6b6972e774..7cfa2c14054533e1325bc953e60bf3eb478a9825 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu May 27 00:07:47 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_list_destroy): only remove the
+       signal if the box exists.
+
 Wed May 26 23:26:51 2004  Matthias Clasen  <maclas@gmx.de>
 
        Support insensitive cells in tree views and combo boxes:

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 1b539226b014ad22edb662e5f8a086710225e001..cf0288bbf6a978693c26fd3459087fea53c22376 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -2467,11 +2467,12 @@ gtk_combo_box_list_destroy (GtkComboBox *combo_box)
                                         0, 0, NULL,
                                         gtk_combo_box_list_button_pressed,
                                         NULL);
-  g_signal_handlers_disconnect_matched (combo_box->priv->box,
-                                        G_SIGNAL_MATCH_DATA,
-                                        0, 0, NULL,
-                                        gtk_combo_box_list_button_pressed,
-                                        NULL);
+  if (combo_box->priv->box)
+    g_signal_handlers_disconnect_matched (combo_box->priv->box,
+                                         G_SIGNAL_MATCH_DATA,
+                                         0, 0, NULL,
+                                         gtk_combo_box_list_button_pressed,
+                                         NULL);
 
   /* destroy things (unparent will kill the latest ref from us)
    * last unref on button will destroy the arrow